From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 17 Dec 2017 16:20:15 +0000 (-0500)
Subject: Revert "css: Fix segfault when GtkCssStyleChange is NULL on gtk_widget_real_style_upd... 
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~38^2~118
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=f44af2e6ae0c023b94794f790a62dc490922eba5;p=gtk%2B3.0.git

Revert "css: Fix segfault when GtkCssStyleChange is NULL on gtk_widget_real_style_updated()"

This reverts commit 7e253f4bd3977a67cf7040ce11e24b9d06100f6a.
---

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ff6d59dd8b..ee4ae277e0 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8162,15 +8162,12 @@ static void
 gtk_widget_real_style_updated (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = widget->priv;
-  GtkCssStyleChange *change = NULL;
 
   gtk_widget_update_alpha (widget);
 
   if (widget->priv->context)
-    change = gtk_style_context_get_change (widget->priv->context);
-
-  if (change)
     {
+      GtkCssStyleChange *change = gtk_style_context_get_change (widget->priv->context);
       const gboolean has_text = gtk_widget_peek_pango_context (widget) != NULL;
 
       if (has_text && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT))
@@ -8178,7 +8175,8 @@ gtk_widget_real_style_updated (GtkWidget *widget)
 
       if (widget->priv->anchored)
         {
-          if (gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_SIZE) ||
+          if (change == NULL ||
+              gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_SIZE) ||
               (has_text && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_SIZE)))
             {
               gtk_widget_queue_resize (widget);